From cf2590d673744dd72bbaed6bd929ee1c606d70fb Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Fri, 6 Jan 2012 13:16:36 -0500 Subject: [PATCH] GtkButton: do not allow both types of actions Only allow one of 'action-name' or 'related-action' to be set. https://bugzilla.gnome.org/show_bug.cgi?id=667394 --- gtk/gtkbutton.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index f7a908443b..d0d905f7ae 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -732,6 +732,7 @@ gtk_button_set_action_name (GtkActionable *actionable, GtkButton *button = GTK_BUTTON (actionable); g_return_if_fail (GTK_IS_BUTTON (button)); + g_return_if_fail (button->priv->action == NULL); if (g_strcmp0 (action_name, button->priv->action_name) != 0) { @@ -1041,6 +1042,8 @@ gtk_button_set_related_action (GtkButton *button, { GtkButtonPrivate *priv = button->priv; + g_return_if_fail (button->priv->action_name == NULL); + if (priv->action == action) return; -- 2.30.2